moving transaction context to client level so that the marker updation can be covered in the client transaction