trunk moved to 3.9