Merge branch 'new/bug_6629'