Squashed 'core/' changes from 4dacc42..38c4179

38c4179 Merge commit '1cb1068ba08d3ccf8abe97548491bd92ca62b15f'
1cb1068 Squashed 'db/' changes from 58ddf34..e37ef46

git-subtree-dir: core
git-subtree-split: 38c4179c285a46022bf0c51c04c2060a0bb2efce
Merge commit '971c3d9a2c82fd61d161e7a79b7740112ce82e92'