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