Merge branch 'bug_10185' into 3.14-master