Merge branch 'bug_9885' into 3.12-master