Merge branch 'bug_9382' into 3.12-master