Merge branch 'bug_8996' into 3.12-master