Merge branch 'bug_9385' into 3.12-master