Merge branch 'bug_8164' into 3.12-master