Merge branch 'bug_9381' into 3.12-master