#10713: merge with 3.2.