DAM-313: Re-running hydra:head generator
DAM-313: Selectively merging in changes from hydra:head generator
DAM-313: Update to HH 6.3.2