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