Merge branch 'bug_9841' into 3.12-master