#13289: merge with 3.2.