diff --git a/Cartfile b/Cartfile
index ae6c1713..f8c2566b 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,5 +1,5 @@
 github "SRGSSR/ComScore-iOS-watchOS-tvOS" "5.8.4"
-github "SRGSSR/srgdataprovider-ios" "6.7"
-github "SRGSSR/srgidentity-ios" "1.0.3"
-github "SRGSSR/srgmediaplayer-ios" "2.7.1"
+github "SRGSSR/srgdataprovider-ios" "6.8"
+github "SRGSSR/srgidentity-ios" "1.0.4"
+github "SRGSSR/srgmediaplayer-ios" "2.8"
 github "SRGSSR/tagcommander-ios" "4.3.3_4.3.1"
diff --git a/Cartfile.private.common b/Cartfile.private.common
index 05f96132..648ce048 100644
--- a/Cartfile.private.common
+++ b/Cartfile.private.common
@@ -1,3 +1,2 @@
-github "kif-framework/KIF" == 3.6.0
-# Fork from AliSoftware/OHHTTPStubs to support Xcode 9.x and Swift 4.
-github "rckoenes/OHHTTPStubs" ~> 6.1.1
\ No newline at end of file
+github "kif-framework/KIF" ~> 3.7.8
+github "AliSoftware/OHHTTPStubs" ~> 8.0.0
\ No newline at end of file
diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary
index c7b2e6dd..bac1996e 100644
--- a/Cartfile.resolved.proprietary
+++ b/Cartfile.resolved.proprietary
@@ -1,3 +1,4 @@
+github "AliSoftware/OHHTTPStubs" "8.0.0"
 github "Mantle/Mantle" "2.1.0"
 github "SRGSSR/ComScore-iOS-watchOS-tvOS" "5.8.4"
 github "SRGSSR/FXReachability" "1.3.2_srg3"
@@ -6,12 +7,11 @@ github "SRGSSR/Masonry" "v1.1.0_srg1"
 github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-ios" "1.2.3"
-github "SRGSSR/srgdataprovider-ios" "6.7"
+github "SRGSSR/srgdataprovider-ios" "6.8"
 github "SRGSSR/srgdiagnostics-ios" "1.0.1"
-github "SRGSSR/srgidentity-ios" "1.0.3"
+github "SRGSSR/srgidentity-ios" "1.0.4"
 github "SRGSSR/srglogger-ios" "1.1"
-github "SRGSSR/srgmediaplayer-ios" "2.7.1"
+github "SRGSSR/srgmediaplayer-ios" "2.8"
 github "SRGSSR/srgnetwork-ios" "1.0.3"
 github "SRGSSR/tagcommander-ios" "4.3.3_4.3.1"
-github "kif-framework/KIF" "v3.6.0"
-github "rckoenes/OHHTTPStubs" "6.1.1"
+github "kif-framework/KIF" "v3.7.8"
diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public
index 24d76f15..ad1e8422 100644
--- a/Cartfile.resolved.public
+++ b/Cartfile.resolved.public
@@ -1,3 +1,4 @@
+github "AliSoftware/OHHTTPStubs" "8.0.0"
 github "Mantle/Mantle" "2.1.0"
 github "SRGSSR/ComScore-iOS-watchOS-tvOS" "5.8.4"
 github "SRGSSR/FXReachability" "1.3.2_srg3"
@@ -6,12 +7,11 @@ github "SRGSSR/Masonry" "v1.1.0_srg1"
 github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-fake-ios" "1.2.3"
-github "SRGSSR/srgdataprovider-ios" "6.7"
+github "SRGSSR/srgdataprovider-ios" "6.8"
 github "SRGSSR/srgdiagnostics-ios" "1.0.1"
-github "SRGSSR/srgidentity-ios" "1.0.3"
+github "SRGSSR/srgidentity-ios" "1.0.4"
 github "SRGSSR/srglogger-ios" "1.1"
-github "SRGSSR/srgmediaplayer-ios" "2.7.1"
+github "SRGSSR/srgmediaplayer-ios" "2.8"
 github "SRGSSR/srgnetwork-ios" "1.0.3"
 github "SRGSSR/tagcommander-ios" "4.3.3_4.3.1"
-github "kif-framework/KIF" "v3.6.0"
-github "rckoenes/OHHTTPStubs" "6.1.1"
+github "kif-framework/KIF" "v3.7.8"
diff --git a/Demo/Info.plist b/Demo/Info.plist
index d68ce8de..5bf01890 100644
--- a/Demo/Info.plist
+++ b/Demo/Info.plist
@@ -10,6 +10,8 @@
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleDisplayName</key>
+	<string>Analytics</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
diff --git a/Demo/Sources/Demos/DemosViewController.m b/Demo/Sources/Demos/DemosViewController.m
index f131ece9..66e9051c 100644
--- a/Demo/Sources/Demos/DemosViewController.m
+++ b/Demo/Sources/Demos/DemosViewController.m
@@ -147,6 +147,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             labels.comScoreCustomInfo = @{ @"media_id" : @(indexPath.row).stringValue };
             
             SRGMediaPlayerViewController *playerViewController = [[SRGMediaPlayerViewController alloc] init];
+            playerViewController.modalPresentationStyle = UIModalPresentationFullScreen;
             [playerViewController.controller playURL:URL atPosition:nil withSegments:nil analyticsLabels:labels userInfo:nil];
             [self presentViewController:playerViewController animated:YES completion:nil];
             break;
diff --git a/Demo/Sources/Demos/DemosViewController.storyboard b/Demo/Sources/Demos/DemosViewController.storyboard
index 862b0b4e..785225ca 100644
--- a/Demo/Sources/Demos/DemosViewController.storyboard
+++ b/Demo/Sources/Demos/DemosViewController.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Jou-aD-EGI">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Jou-aD-EGI">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -24,14 +24,14 @@
                                         <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kFo-IY-tFV" id="C71-Tu-DOL">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Automatic tracking" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="G7F-bw-BSq">
                                                     <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -41,14 +41,14 @@
                                         <rect key="frame" x="0.0" y="99.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jAL-0d-Asf" id="6Nz-sv-iv4">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Automatic tracking with levels" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bJh-LQ-S2B">
                                                     <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -58,14 +58,14 @@
                                         <rect key="frame" x="0.0" y="143.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aAD-3m-Cca" id="YmX-By-ucz">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Automatic tracking with many levels" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RR0-uN-yJ6">
                                                     <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -75,14 +75,14 @@
                                         <rect key="frame" x="0.0" y="187.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4bx-Zc-UpE" id="6rs-WU-2Ok">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Automatic tracking with levels and labels" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1Bx-Fe-vI4">
                                                     <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -92,14 +92,14 @@
                                         <rect key="frame" x="0.0" y="231.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yFw-Iq-dLV" id="Egw-ga-Jmp">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Manual tracking" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="g2L-qK-XxP">
                                                     <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -109,14 +109,14 @@
                                         <rect key="frame" x="0.0" y="275.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9MI-95-NfD" id="hUT-jD-sd7">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Missing title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tJ4-bg-Tzv">
                                                     <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -134,10 +134,10 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Live" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="erq-Wv-rYw">
-                                                    <rect key="frame" x="16" y="0.0" width="344" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -151,10 +151,10 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="VOD" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="sam-4U-lcR">
-                                                    <rect key="frame" x="16" y="0.0" width="344" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -168,10 +168,10 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="DVR" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Eon-le-PuK">
-                                                    <rect key="frame" x="16" y="0.0" width="344" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -189,10 +189,10 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="From push notification (simulated)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ohJ-HR-Klh">
-                                                    <rect key="frame" x="16" y="0.0" width="344" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
diff --git a/Demo/Sources/Simple/SimpleViewController.storyboard b/Demo/Sources/Simple/SimpleViewController.storyboard
index a86e458c..45d82988 100644
--- a/Demo/Sources/Simple/SimpleViewController.storyboard
+++ b/Demo/Sources/Simple/SimpleViewController.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="UEQ-Hu-9WE">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14845" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="UEQ-Hu-9WE">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14799.2"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,21 +17,21 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rYH-2M-H0S">
-                                <rect key="frame" x="168.5" y="288.5" width="38" height="30"/>
+                                <rect key="frame" x="168.5" y="278.5" width="38" height="30"/>
                                 <state key="normal" title="Track"/>
                                 <connections>
                                     <action selector="trackPageView:" destination="UEQ-Hu-9WE" eventType="touchUpInside" id="ANy-Jp-uCQ"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KEo-m0-Yrt">
-                                <rect key="frame" x="168" y="368.5" width="39" height="30"/>
+                                <rect key="frame" x="168" y="358.5" width="39" height="30"/>
                                 <state key="normal" title="Reset"/>
                                 <connections>
                                     <action selector="reset:" destination="UEQ-Hu-9WE" eventType="touchUpInside" id="1dm-k2-mP4"/>
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
                             <constraint firstItem="KEo-m0-Yrt" firstAttribute="centerY" secondItem="ii3-Nj-oxx" secondAttribute="centerY" constant="40" id="1nh-Xp-PN2"/>
                             <constraint firstItem="KEo-m0-Yrt" firstAttribute="centerX" secondItem="ii3-Nj-oxx" secondAttribute="centerX" id="JxJ-e2-qgs"/>
diff --git a/Makefile b/Makefile
index 14ddefed..e7dad198 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 #!/usr/bin/xcrun make -f
 
+# Xcode 11 workaround, see https://github.com/Carthage/Carthage/issues/2825#issuecomment-513160923
+export XCODE_XCCONFIG_FILE=../../../xcode11fix.xcconfig
+
 CARTHAGE_FOLDER=Carthage
 CARTHAGE_RESOLUTION_FLAGS=--new-resolver --no-build
 CARTHAGE_BUILD_FLAGS=--platform iOS --cache-builds
diff --git a/SRGAnalytics.xcodeproj/project.pbxproj b/SRGAnalytics.xcodeproj/project.pbxproj
index ec162a4c..4368ecb2 100644
--- a/SRGAnalytics.xcodeproj/project.pbxproj
+++ b/SRGAnalytics.xcodeproj/project.pbxproj
@@ -1797,7 +1797,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 3.7.3;
+				MARKETING_VERSION = 3.7.4;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1994,7 +1994,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 3.7.3;
+				MARKETING_VERSION = 3.7.4;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -2336,7 +2336,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 3.7.3;
+				MARKETING_VERSION = 3.7.4;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -2389,7 +2389,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 3.7.3;
+				MARKETING_VERSION = 3.7.4;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
diff --git a/xcode11fix.xcconfig b/xcode11fix.xcconfig
new file mode 100644
index 00000000..a9f9f15f
--- /dev/null
+++ b/xcode11fix.xcconfig
@@ -0,0 +1,2 @@
+LD_VERIFY_BITCODE__XCODE_PRODUCT_BUILD_VERSION_11M374r=NO
+LD_VERIFY_BITCODE=$(LD_VERIFY_BITCODE__XCODE_PRODUCT_BUILD_VERSION_$(XCODE_PRODUCT_BUILD_VERSION))