Merge branch 'dev' into 'test'

Dev

See merge request !83
2 jobs for test in 7 minutes and 16 seconds (queued for 6 minutes and 11 seconds)
Status Name Job ID Coverage
  Build
passed build #40274
build

00:07:13

 
  Deploy
passed deploy_test #40275
deploy_test

00:00:02