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