Issue 23661: null-merge with 3.5.