Merge branch 'bug_10006' into 3.14-master