Merge branch 'new/bug_4330' into kcmaster