#17425: null merge 3.2