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