Report version usage for RPC and REST dispatch

I agree with Chris-V

As for the whole reformat, we could do it in one PR I agree.