Merge branch 'bug_8954' into 3.12-master