Merge branch 'new/bug_6479' into kcmaster