#12266: merge with 3.2.