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