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