Merge branch 'bug_9827' into 3.12-master