Refectoring: Merge RawActionRequest and ActionRequest