Merge branch 'dev' into 'test'

Dev

See merge request !97
2 jobs for test in 8 minutes and 30 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Build
passed build #48785
build

00:08:28

 
  Deploy
passed deploy_test #48786
deploy_test

00:00:02