Merge branch 'bug_8108' into 3.12-master