Issue #11855: merge from 3.1