More work on merging. Temporarily remove following speed checks.