Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !305
8 jobs for master in 3 minutes and 22 seconds