#11763: merge with 3.1.