Merge branch 'bug_9281' into 3.12-master