Merge branch 'bug_9812' into 3.12-master