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