Merge branch 'develop' into 'master'

Develop

See merge request !341
3 jobs for master in 3 minutes and 56 seconds (queued for 2 seconds)