Manual Legacy merges