Merge branch 'bug_8946' into 3.12-master