KCGOR-3804

KCGOR-3804