Merge branch 'master' into 'production'

Merge master into production

See merge request !175
2 jobs for v2.2.0
in 2 minutes and 24 seconds, using 0 compute credits, and was queued for 1 second
latest