#17471: merge from 3.3