Basvi-Satya-Bug Fixes

UATNBNXR0017(Basvi),UATNBNXR0016(Satya),