Merge branch 'bug_7241' into 3.12-master