update to 3.8 branch