Merge "Fix mac build (second attempt)"