#17798: merge with 3.3.