Merge branch 'core-updates'