Merge branch 'bug_9947' into 3.12-master