Squashed 'core/' changes from cc4a1b6..bd3d696

bd3d696 And again

git-subtree-dir: core
git-subtree-split: bd3d696e5319fe10fde145a4207893f03974f956
Merge commit 'a51df4700bbb26b584bca59d35e5ea84038a5819' into develop