Merge branch 'bug_7143' into 3.14-master