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