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