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