Basvi-Fixes

UATNBNXR002(alignment issue)