Satya - bugfixes

for Extra duties -UATNBNXR0016