#12665: merge with 3.2