[WIP] Vigor updates for Team-Hydra caf kernel part 2.