Switch autoupdate branch to production.
Merge branch 'master' into prod/welsh