Merge branch 'master' into 'production'

Merge master to production

See merge request !201
1 job for v2.2.0-2
in 2 minutes and 14 seconds, using 0 compute credits, and was queued for 1 second