Merge branch 'bug_9265' into 3.12-master