Merge branch 'bug_9711' into 3.12-master