#18267: merge with 3.3.