[Bug 225648] Merge Review: compat-gcc-296