#18705: merge with 3.3.