Merge pull request #6399 from hydra/compilation-fixes-1