Merge branch 'bug_7896' into 3.12-master