Merge remote branch 'kc/new/enh/bug_6013' into kcmaster