Issue #16169: Merge