Squashed 'core/' changes from 3a55514..8fb56b6

8fb56b6 -n 6

git-subtree-dir: core
git-subtree-split: 8fb56b632a02b84c922176d7f244d9a014ddf8ff
Merge commit 'eb465ff44badc6cd793cb3898deddfd6d8c5d1b2'