Merge branch 'bug_9767' into 3.12-master