[Bug 225649] Merge Review: compat-gcc-32