Merged back to v1.7001-multi-db