#12017: merge with 3.2.