#11732: null merge with 3.3.