Squashed 'core/' changes from 6bf83c4..f7a60e3

f7a60e3 1
d0eac49 -n new feature

git-subtree-dir: core
git-subtree-split: f7a60e3a296d7db5fcd00f1821f1d6b65bb8e7b9
Merge commit '3b46b0d83270bd8def7dea4bd37cc28228141f1d' into feature
1