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