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