Merge branch 'bug_9397' into 3.12-master