Merge branch 'bug_10110' into 3.14-master