Merge branch 'bug_9263' into 3.12-master