Merge branch 'bug_9267' into 3.12-master