#17877: merge with 3.3.