#16559: merge with 3.2.