Merge branch 'dev' into 'test'

Dev

See merge request !76
2 jobs for test in 7 minutes and 22 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Build
passed build #39665
build

00:07:19

 
  Deploy
passed deploy_test #39666
deploy_test

00:00:03