Merge branch 'bug_10072' into 3.14-master