Large Haddock submodule merge landing soon