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