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