Squashed 'core/' content from commit 186ce0d

git-subtree-dir: core
git-subtree-split: 186ce0d5d7f05e917d22de6edb8806aa6c1a03b7
Merge commit '4fa632dda60a705df27348525155b102ed249c8f' as 'core'