#11942: merge with 3.1.