#7311: merge with 3.2.