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