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