Merge branch 'bug_10030' into 3.14-master