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