Merge branch 'develop' into 'master'

V2.0

See merge request !9
2 jobs for master in 2 minutes and 22 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #28599
docker
test

00:01:51

 
  Deploy
passed #28600
docker
deploy

00:00:30