[DF-4841] macos|ios fixes