Merge branch 'bug_9583' into 3.12-master