Branch: RR-9981_conflict-drawer-suffix-leak#eae4789