Merging changes from Hydra.