#17368: merge with 3.3.