Merge pull request #9177 from FinleyMcIlwaine/wip/haddock-avoid-recomp