Merge branch 'new/bug_6328'