Merge branch 'bug_9873' into 3.12-master