#18196: merge with 3.3