Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !234
3 jobs for v3.1.2 in 58 seconds (queued for 1 second)
latest