Merge branch 'dev' into 'master'

Dev

See merge request !114
4 jobs for master
in 3 minutes and 59 seconds and was queued for 4 seconds