Null merge from 3.5.