Merge branch 'bug_7055' into 3.14-master