Add missing commits back to 3.0