fix for traits NRE
Cleanup after PR merge
Fix again
CsProj fixed