#18856: merge with 3.3.