#18839: merge with 3.3.