#12531: merge with 3.2.