Rewrite to remove the variant in the response
Merge branch 'fix-refactor-req-resp'