Merge branch 'bug_8896' into 3.14-master