Squashed 'core/' changes from b0d1e2f..9589c07

9589c07 -n 11

git-subtree-dir: core
git-subtree-split: 9589c073b4f83160d59d38ea841d36dd4a3a1e5f
Merge commit '39cf7502461abe821a3be409a7e131210b09ff2d'