Integrate Cpp build fixes into develop