Merge pull request #8971 from haskell/mergify/bp/3.10/pr-8877