#16677: merge with 3.3.