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