Merge branch 'bug_10017' into 3.14-master