[DF-185] Fixed macos project
[DF-185] Merge