#12725: merge with 3.2.