Merge branch 'bug_9911' into 3.12-master