#12601: merge with 3.2.