Satya - Bug Fixes

UATNBFBL024