Merge remote-tracking branch 'kc/new/bug_5868' into kcmaster