Merge branch 'master' into 'production'

Merge v4.0.1 to production

See merge request !110
1 job for v4.0.1
in 22 minutes and 31 seconds, using 0 compute credits, and was queued for 9 seconds
latest