Merge branch 'bug_8664' into 3.12-master