Project updates
Merge fixes
Project file updates.
Merge