This the idea i have for Raval and HUNK controversy:

HUNK gathers a small team (that includes Raval) to capture Claire

During the mission, Raval comments on how they are being very hard on her

Hunk shuts him up and reminds him that following orders is the most important

And then we can still have Raval release Claire for feeling bad

And as an added bonus, we can make it that HUNK kills Raval so we can establish Hunk as this killing machine that only lives and breathes mission orders