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