#12781: merge with 3.2