#16476: merge with 3.2.