#7960: merge with 3.2.