Merge remote branch 'kc/new/bug_6058' into kcmaster