Initial uplevel to 3.10