#17066: merge with 3.3.