Merge remote branch 'kc/new/bug_4305' into kcmaster