Squashed 'core/' changes from cca602d..eac2a7c

eac2a7c -n 8

git-subtree-dir: core
git-subtree-split: eac2a7cd2e5f367191beb7ca77f8ca2c3f5afa0f
Merge commit 'dfbfc6c207af28f98834f3261bf864600231e396'