Merge "rdbms: optimize Database::selectDomain() to avoid extra queries"