#13379: merge with 3.2.