#17635: merge with 3.3.