Merge branch 'dev' into 'master'

Finale Merge of the dev branch into master

See merge request !1
2 jobs for master in 49 seconds (queued for 2 seconds)