Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !109
5 jobs for master in 5 minutes (queued for 1 second)