Merge branch 'bug_9582' into 3.12-master