Squashed 'core/' content from commit 07893fe

git-subtree-dir: core
git-subtree-split: 07893fe66dc894eeaadd460fa830c6d252725952
Merge commit '76f4ad462f28234de6640dcedac804a0f9fa4db0' as 'core'
Squashed 'core/' changes from 07893fe..232efec

232efec sd

git-subtree-dir: core
git-subtree-split: 232efecbda87083940c8456796d7fa0f6590edd4
Merge commit '60e7d924c51b973e7379f1da5a5ae9137fb14c18'
Squashed 'core/' changes from 232efec..ccacd74

ccacd74 yep
REVERT: 232efec sd
REVERT: 07893fe yep

git-subtree-dir: core
git-subtree-split: ccacd74e5d803b1dc7441d8f93a91b7201d838dc
Merge commit '22ce0dc286ae3cdf1a752d11449c2ce4984ad80e'
Squashed 'core/' changes from ccacd74..232efec

232efec sd
07893fe yep
REVERT: ccacd74 yep

git-subtree-dir: core
git-subtree-split: 232efecbda87083940c8456796d7fa0f6590edd4
Merge commit '3b6d018f1341c8f3afb5e9a030fe0669b5e5131e'