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