Merged in db-only-on-homehost fix