#18681: merge with 3.3.