#13494: merge with 3.2.