#13233: null merge with 3.2.