#12072: merge with 3.2.