Merge branch 'bug_9320' into 3.12-master