#13094: merge with 3.2.