Satya -Bug Fixes

UATNBNXR018