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