Merge branch 'bug_9479' into 3.12-master