#16862: merge with 3.2.