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