Merge branch 'bug_10225' into 3.14-master