#18273: merge with 3.3.