Merge branch 'dev' into 'master'

+ fix for stable branch CI and other fixes

See merge request !3
5 jobs for master
in 6 minutes and 56 seconds, using 0.0 compute credits, and was queued for 10 seconds