[Bug 225647] Merge Review: compat-db