Squashed 'core/' changes from 5a904e3..0f3e63d

0f3e63d Merge commit 'f34d7a745429e6cb40dd3833a3c9785b227a661a'
f34d7a7 Squashed 'db/' changes from 20547cb..c4fb1ce

git-subtree-dir: core
git-subtree-split: 0f3e63d726822d2017bc5985aa8af72bf4eab743
Merge commit '6c62b3aa2a3a30620c690bfb63eb7bcb414ff50e'