#17700: merge with 3.3