#13695: merge with 3.2.