Temporary workaround for #1842.
Merge branch 'master' into production