Merge branch 'dev' into 'master'

Dev

See merge request !1
3 jobs for master in 20 seconds (queued for 7 seconds)