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