Merge branch 'bug_8840' into 3.14-master