LibCVSCommon merged.