#12787: merge with 3.2