#12709: merge with 3.2