Merge ghc-new-co into master branch