Merge branch 'bug_10230' into 3.14-master