Merge branch 'bug_8294' into 3.14-master