PRD-4754 - Fixing MacOS build