Merge branch 'bug_10233' into 3.14-master