'Squashed all the Halo commit (1 of 2)