bringing hydra pr237 to sdk

Looks like this is bringing along a few other from hydra too...