Merge branch 'master' into production

3 jobs for v1.1.7
in 3 minutes and 18 seconds, using 0 compute credits, and was queued for 4 seconds