Squashed 'core/' content from commit 252ebdf

git-subtree-dir: core
git-subtree-split: 252ebdfbebe37ac5e9218ae655374ba1504c702f
Merge commit '2f40f4aa8f44d7f2a76260efa215c3566fb3c0c7' as 'core'