#18803: merge with 3.3.