#17657: merge with 3.3.