Merge branch 'bug_9213' into 3.12-master