Merge branch 'bug_8264' into 3.14-master