[DF-4152] Compilation fix for mac os and iOS. Small merge error fix.