Merge branch 'bug_10058' into 3.14-master