Merge branch 'bug_8079' into 3.12-master