Merge branch 'bug_9587' into 3.12-master