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