Merge branch 'bug_9330' into 3.12-master