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