Squashed 'core/' content from commit e718083

git-subtree-dir: core
git-subtree-split: e718083f44fe0f4da9bb2a5f156953bb67eec6b0
Merge commit 'e7e60666665d100fd6887dfe6d2af51238bd369f' as 'core'