Squashed 'core/' changes from e718083..8682b7f

8682b7f -n feature

git-subtree-dir: core
git-subtree-split: 8682b7f087440f1869a54f9aacb8c120994d5741
Merge commit 'fc63ed9749a7b467ab35d4fc123cbcf5a2e61f79'