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

253825d -n 4

git-subtree-dir: core
git-subtree-split: 253825d2eaa1b1cdc9ebe2be4f4d217331958005
Merge commit '26034368df7ce0edbe571f5961cfb985582c9258'
5