Merge branch 'master' into 'production'

Merge master into production

See merge request !186
1 job for v2.2.0-1 in 61 minutes and 12 seconds
latest