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