Issue #18702 null merge