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