Merge branch 'bug_8419' into 3.14-master