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