Merge remote-tracking branch 'origin/production' into production

3 jobs for v1.0.0
in 1 minute and 40 seconds, using 0 compute credits, and was queued for 1 minute and 14 seconds