Merge branch 'dev' into 'test'

Dev

See merge request !79
2 jobs for test in 7 minutes and 5 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Build
passed build #39946
build

00:07:03

 
  Deploy
passed deploy_test #39947
deploy_test

00:00:02