#17438: merge with 3.3.