Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !319
8 jobs for master in 2 minutes and 57 seconds (queued for 1 second)