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