#13715: merge with 3.2.