Merge branch 'develop-bug-corrections' into 'master'

Develop bug corrections

See merge request !23
3 jobs for master
in 3 minutes and 49 seconds, using 0 compute credits, and was queued for 5 minutes and 29 seconds