Squashed 'core/' content from commit 05a2721

git-subtree-dir: core
git-subtree-split: 05a272188ed97d2761737fccd65de78b3b56995f
Merge commit '97b7254bb0761a8a6c7bca935b3902842db7008d' as 'core'