Prepare for 8.0.0.CR1
Fix broken assemblies