Merge branch 'bug_9209' into 3.12-master