#11926: merge with 3.1.