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

8fb56b6 -n 6

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