#17493: merge with 3.3.