Merge branch 'dev' into 'master'

Dev

See merge request !1
3 jobs for master
Status Job ID Name Coverage
  Build
canceled #415
build

 
  Test
canceled #417
allowed to fail
code_quality

canceled #416
test