Squashed 'core/' changes from bfd1857..5a904e3

5a904e3 Merge commit 'a576aee516a86fc474331a5b2bd1c00b833661ed'
a576aee Squashed 'db/' changes from 0ea4bcb..20547cb

git-subtree-dir: core
git-subtree-split: 5a904e33f0ee27ad4e2481ed2a110a8fefbcd18d
Merge commit '803f76ff275bcd712d21a57ddd69f04c556164ba'