Merge branch 'bug_9574' into 3.12-master