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