Merge branch 'bug_8641' into 3.12-master