[Bug 225292] Merge Review: audit