Merge branch 'bug_7243' into 3.12-master