EPG-34558 - updated dotnet code