Merge "Fix mac build." into rvc-dev