Squashed 'core/' content from commit 1f7deae

git-subtree-dir: core
git-subtree-split: 1f7deae3f92b83eec8a7b21ed62a22b64b579dcb
Merge commit 'e99e41e760e1eba3fba64d6dfdcbecbef050ff55' as 'core'