Merge branch 'bug_10050' into 3.14-master