Merge branch 'bug_9331' into 3.12-master