Update for 8.0.0.Alpha2