Squashed 'core/' changes from 8fb56b6..cca602d

cca602d -n 7

git-subtree-dir: core
git-subtree-split: cca602da820777512784541afb7fc1063e95f5e2
Merge commit '2c694983185984f22ac1d217b41f1211e0977b4c'