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