Squashed 'core/' content from commit f7a60e3

git-subtree-dir: core
git-subtree-split: f7a60e3a296d7db5fcd00f1821f1d6b65bb8e7b9
Merge commit '7f66caa61c811697624238ca1515707d9d3f25d8' as 'core'