Merge branch 'bug_9586' into 3.12-master