Merge branch 'bug_8715' into 3.12-master