Issue #10405: merge from 3.3