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