Issue9670: Merge backout from 3.2.