[Bug 225632] Merge Review: byacc