Merge branch 'Module-and-Core-Updates'
Merge branch 'master' into Module-and-Core-Updates