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