#18687: merge with 3.3.