Hand merge out of latest head to keep track and update for tests