Merge branch 'bug_7054' into 3.14-master