rebase to ghc main repo