Merge branch 'bug_8945' into 3.12-master