Merge branch 'bug_10281' into 3.14-master