#10385: merge with 3.2.