Merge branch 'master' into 'production'

Merge master to production for v2.1.0

See merge request !196
2 jobs for v2.1.0
in 13 minutes and 16 seconds, using 0 compute credits, and was queued for 12 minutes and 41 seconds
latest