#5057: null merge with 3.3 (only add tests).