Merge branch 'develop' into 'master'

Develop

See merge request !172
3 jobs for v2.11.4 in 2 minutes and 48 seconds
latest