Merge pull request #9031 from haskell/mergify/bp/3.10/pr-8793