Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !183
3 jobs for v2.12.1 in 2 minutes and 55 seconds (queued for 3 seconds)
latest