Rebase of v1.7001-multi-db-nohome