Merge branch 'hotfix-1.2.0' into 'master'

Hotfix 1.2.0

See merge request !103
2 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds