Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !102
5 jobs for master in 4 minutes and 13 seconds (queued for 1 second)