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