#16336: merge with 3.2.