Merge branch 'develop' into 'master'

Develop

See merge request !222
3 jobs for v3.0.1 in 1 minute and 54 seconds
latest