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