Merge pull request #8272 from Mikolaj/build-with-ghc-9