Merge branch 'master' into 'production'

Merge master to production for v5.2.0

See merge request !206
2 jobs for v5.2.0
in 11 minutes and 54 seconds, using 0 compute credits, and was queued for 11 minutes and 54 seconds
latest