Merge branch 'dev' into 'test'

Dev

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

00:07:08

 
  Deploy
passed deploy_test #40135
deploy_test

00:00:02