#12074: merge with 3.2.