#12670: merge with 3.2