Merge branch 'develop-bugfixes-2.1.0' into 'master'

Develop bugfixes 2.1.0

See merge request !16
1 job for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds