#17714: merge with 3.3.