#18380: merge with 3.3.