Merge branch 'bug_9571' into 3.12-master