Merge branch 'bug_9105' into 3.12-master