Issue #15467: Merge 3.2