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