Satya - Bug Fixes

UATNBNXR044 – 1st Reverted, UATNBNXR039(alert msg change)