Issue #15657: Null merge from 3.5