Merge branch 'bug_9843' into 3.12-master