#17265: merge with 3.2.