Squashed 'core/' changes from 1d72fb8..22f2bf0

22f2bf0 -n 14

git-subtree-dir: core
git-subtree-split: 22f2bf024b00500d65410b2837bce9957788d7e8
Merge commit '2c45d93d3bc9d835579727a938bbeb271a34fed7'
15