Merge branch 'bug_9875' into 3.12-master