Merge branch 'core-and-module-updates-'
Merge branch 'master' into core-and-module-updates-