Merge branch 'bug_8880' into 3.12-master