Null merge from 3.3 branch.