#17564: merge with 3.3.