Merged all v1.7001-multi-db changes into one commit to rebase forward