Re: [GHC] #10395: ghc-7.10 branch : Please cherry-pick 1a4374c1e2 from master