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