Merge branch 'bug_10176' into 3.14-master