Merge branch 'bug_8942' into 3.12-master