Merge branch 'bug_9451' into 3.12-master