#18895: merge with 3.3.