Squashed 'core/' content from commit 6bf83c4

git-subtree-dir: core
git-subtree-split: 6bf83c4fb2375d390cf36ce7fee27e756ae7d7ae
Merge commit 'ec64aeb26b133e8c7ebbd1f7b562c95ed13f119e' as 'core'