Merged in ba3d -db-sync-2