[Bug 225253] Merge Review: apr