#18403: merge with 3.3.