Null merge from 3.4