#18581: merge with 3.3.