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