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