Issue9670: Merge backout to 3.2.