Null merge from 3.6