Merge branch 'bug_9421' into 3.12-master