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