Merge branch 'bug_9585' into 3.12-master