Merge branch 'develop-2.2.1' into 'master'

New release 2.2.1

See merge request !199
1 job for master in 2 minutes and 17 seconds (queued for 1 second)