Merge branch 'stf593' into 'develop'

STF593 - Final Drafts v2.1.1 merged to develop

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