Merge branch 'dev' into 'test'

fix for #138

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

00:03:28

 
  Deploy
passed deploy_test #32421
deploy_test

00:00:02