Merge branch 'bug_10065' into 3.14-master