#5723: merge with 3.2.