Merge remote-tracking branch 'kc/new/enh/bug_6871' into kcmaster