Squashed 'core/' changes from 1d72fb8..dcdc2f0

dcdc2f0 -n 15
22f2bf0 -n 14

git-subtree-dir: core
git-subtree-split: dcdc2f0e95259516de353acdafbe0ca5222a96f1
15