Merge branch 'bug_10259' into 3.14-master