#13301: merge with 3.2.