#17809: merge with 3.3.