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