Merge branch 'dev' into 'master'

update & fixes

See merge request !158
1 job for master in 3 minutes and 51 seconds (queued for 13 seconds)
latest
Status Name Job ID Coverage
  Build
passed build #39053

00:03:51