merge 79422b3684f1 in 3.3 branch (issue 10340)