Prepare for CP-2 release
Merge codeproject-2
commit changes before pull
Correct pull conflict