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