Merge branch 'develop' into 'master'

Develop

See merge request !177
3 jobs for v2.11.6 in 2 minutes and 4 seconds (queued for 1 second)
latest