Squashed 'core/' changes from 0b1b293..0b8b724

0b8b724 -n 4

git-subtree-dir: core
git-subtree-split: 0b8b72458285cad6bff26d7636c229685f3f34ee
Merge commit '2d99174f77b45507b1cb6644db426080192e1282'