merge Cpp doc fixes into develop