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