#17333: merge with 3.3.