#12204: merge with 3.2.