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