Update standalone tools to 2.X upstream