Regen projects
Add missing projects
Fix merge