#16683: merge with 3.2.