#12692: null merge with 3.3