#16518: merge with 3.3.