Update for 8.0.0.Alpha3-SNAPSHOT