Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !100
5 jobs for master in 3 minutes and 36 seconds (queued for 1 second)