BUG: 1915110, 1858649

Bug fixes from hydra-spec