[DF-2446], [DF-2607] Fix MacOS and iOS project