Additional modifications for the 7.0.0.Alpha1 release