Merge branch 'bug_8557' into 3.12-master