Merge branch 'bug_8832' into 3.12-master