#6780: merge with 3.1.