Squashed 'core/' changes from e7793f8..253825d

253825d -n 4
3771892 -n 3

git-subtree-dir: core
git-subtree-split: 253825d2eaa1b1cdc9ebe2be4f4d217331958005
Merge commit '0215c8d787be2ea4869901b5d77eb7ec2f9688a9'
Squashed 'core/' changes from 253825d..3a55514

3a55514 -n 5

git-subtree-dir: core
git-subtree-split: 3a5551455bf6f6ae1ffe499965ba623e38dc37cc
Merge commit 'c6648dba32d34014cc5626e3589a70f32533ab63'