Merge branch 'bug_8278' into 3.14-master