Merge branch 'Core-Patch-1'
Merge branch 'master' into Core-Patch-2
patch 2