#16157: merge with 3.3.