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