Squashed 'core/' changes from 253825d..3a55514

3a55514 -n 5

git-subtree-dir: core
git-subtree-split: 3a5551455bf6f6ae1ffe499965ba623e38dc37cc
Merge commit 'ac554b5b6843dc2c109416ed24ce7ca04afe9d85'