Squashed 'core/' content from commit b43b00a

git-subtree-dir: core
git-subtree-split: b43b00a633b79f1a88749ac5b769a9f7499c447a
Merge commit '8451cb8648e38cce8dee283ad24f80d08aff21e5' as 'core'