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