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