Merge branch 'develop' into 'master'

STF593 - Final drafts v2.1.1 merged to MASTER

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