#12183: merge with 3.2.