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