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