Fix cpcrslib
Merge