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