Merge branch 'bug_10106' into 3.14-master