Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !237
3 jobs for v3.1.3 in 1 minute and 4 seconds (queued for 1 second)
latest