Merge branch 'develop' into 'master'

STF593 - Milestone A - Merge v2.1.1 to Master branch

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