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 (queued for 10 seconds)
Status Job ID Name Coverage
  External
passed Validation

00:00:06