#8414: merge with 3.2.