Merge branch 'bug_10079' into 3.14-master