Downstream Changes

changes made on team-hydra repo