Satya - BugFixes

UATNBNXR045-3rd revert