Merge branch 'bug_9106' into 3.12-master