#16747: merge with 3.3.