Merge branch 'bug_9946' into 3.12-master