Issue #16481: Merge