Merge branch 'bug_8758' into 3.12-master