Merge branch 'develop' into 'master'

[release] Regular merge of develop

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