#17334: merge with 3.3.