Merge branch 'develop' into 'master'

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

See merge request !1
2 jobs for master in 0 seconds (queued for 3 seconds)