Merge branch 'bug_9570' into 3.12-master