#16128: merge with 3.2.