#18741: merge with 3.3.