Merge branch 'staging' into 'core-updates'.