Changes for multi-DB intersection.
merge conflict corrections