Rebased v1.7001-multi-db forward to tip of v1.65, old branch is hidden