#12677: merge with 3.2