Merge branch 'bug_7143' into 3.12-master