Merge branch 'bug_9760' into 3.12-master