Merge branch 'bug_10166' into 3.14-master