Merge branch 'bug_8682' into 3.12-master