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