#16556: merge with 3.3.