Merge branch 'dev' into 'master'

Dev

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