Merge branch 'bug_9465' into 3.12-master