Merge branch 'bug_8559' into 3.12-master