Merge branch 'bug_8220' into 3.12-master