Merge branch 'bug_10085' into 3.14-master