Merge "Attempt to fix mac build" into sc-v2-dev