Merge branch 'origin/core-updates-next' into core-updates