Merge branch 'bug_8979' into 3.12-master