Issue #19464 Null merge with 3.3