Merge branch 'bug_8984' into 3.12-master