Merging the v1.7001-multi-db-nohome branch into single commit to rebase forward