Null merge 3.5->3.6